Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:33:13 +0000 (10:33 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:33:13 +0000 (10:33 -0700)
commit03e41df147baf11d5cd83557d3603c1e736c9f3e
tree16471843b19146842d371c2de130fc240ffd41b6
parent0ec6c302a3d1cb7f45eae239d9d0455929c31183
parent32306041f15f8740471fc22a4de733e814034122
Merge from trunk.
src/ChangeLog
src/alloc.c
src/emacs.c
src/frame.h
src/keyboard.c
src/lisp.h
src/minibuf.c
src/process.c
src/window.c
src/xdisp.c